Merge git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Tue, 16 Jan 2018 00:01:23 +0000 (19:01 -0500)
committerTom Rini <[email protected]>
Tue, 16 Jan 2018 00:01:23 +0000 (19:01 -0500)

Trivial merge